Change in openvpn[master]: PUSH_UPDATE: Added remove_option() and do_update().
A message that is not in the archive (sent off-list or not yet received): gerrit.1732124549000.I507180d7397b6959844a30908010132bc3411067@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to review the following change.
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
6 files changed, 355 insertions(+), 62 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/1
src/openvpn/init.c +41 -0
@@ -2567,6 +2567,47 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
src/openvpn/init.h +2 -0
@@ -86,6 +86,8 @@bool pulled_options, unsigned int option_types_found); +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);
src/openvpn/options.c +243 -62
341 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No option found" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +54 -0
60 lines not on this page · raw message
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); + +void +destroy_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 1
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#2).
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
6 files changed, 354 insertions(+), 32 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/2
src/openvpn/init.c +41 -0
@@ -2567,6 +2567,47 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
src/openvpn/init.h +2 -0
@@ -86,6 +86,8 @@bool pulled_options, unsigned int option_types_found); +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);
src/openvpn/options.c +242 -32
310 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No option found" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +54 -0
60 lines not on this page · raw message
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); + +void +destroy_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 2
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 7: Code-Review-2
(2 comments)
File src/openvpn/init.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/94a55af1_56ebeb0e :
PS4, Line 89: bool do_update(struct context *c, unsigned int option_types_found); Doxygen
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/3765b756_2ab72e4d :
PS7, Line 3300: && (opt->routes->flags & RG_DEF1))
this gives me "access violation" on Windows, opt->routes is nullptr.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 7
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Tue, 03 Dec 2024 14:42:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#8).
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
6 files changed, 383 insertions(+), 32 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/8
src/openvpn/init.c +41 -0
@@ -2567,6 +2567,47 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
src/openvpn/init.h +12 -0
@@ -86,6 +86,18 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);
src/openvpn/options.c +261 -32
329 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +54 -0
60 lines not on this page · raw message
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); + +void +destroy_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 8
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos, stipa.
mrbff has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 7:
(2 comments)
File src/openvpn/init.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/c56bc11c_d397fa0c :
PS4, Line 89: bool do_update(struct context *c, unsigned int option_types_found);
Quoted 1 line
Doxygen
Done
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/f9991389_446e70bf :
PS7, Line 3300: && (opt->routes->flags & RG_DEF1))
Quoted 1 line
this gives me "access violation" on Windows,
opt->routesis nullptr.
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 7
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 03 Dec 2024 20:40:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 8: Code-Review-2
(1 comment)
Patchset:
PS8:
Now I got this one:
2024-12-04 11:39:16 us=531000 PUSH: Received control message: 'PUSH_UPDATE,ifconfig 10.8.0.4 255.255.255.0' 2024-12-04 11:39:18 us=328000 OPTIONS IMPORT: --ifconfig/up options modified 2024-12-04 11:39:18 us=328000 OPTIONS ERROR: failed to negotiate cipher with server. Configure --data-ciphers-fallback if you want to connect to this server. 2024-12-04 11:39:18 us=328000 ERROR: Failed to apply push options 2024-12-04 11:39:18 us=328000 Failed to update options 2024-12-04 11:39:18 us=328000 TCP/UDP: Closing socket
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 8
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Wed, 04 Dec 2024 10:41:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 8:
(1 comment)
Patchset:
PS8:
Quoted 1 line
Now I got this one: […]
Not resolved.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 8
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Fri, 06 Dec 2024 09:08:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#9).
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 392 insertions(+), 40 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/9
src/openvpn/init.c +44 -6
@@ -2445,7 +2445,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2567,6 +2567,47 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2645,11 +2686,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2745,7 +2783,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update);void inherit_context_child (struct context *dest,const struct context *src);
src/openvpn/multi.c +1 -1
@@ -2409,7 +2409,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +261 -32
329 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +54 -0
60 lines not on this page · raw message
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); + +void +destroy_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 9
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos, stipa.
mrbff has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 9:
(1 comment)
Patchset:
PS8:
Quoted 1 line
Not resolved.
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 9
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 10 Dec 2024 10:46:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 9: Code-Review-2
(1 comment)
Patchset:
PS9:
I managed to change client IP address and return it back, so ifconfig push works, no crashes etc. However pushing routes didn't work for me - push-update command was processed but routing table wasn't updated:
https://gist.github.com/lstipakov/7fd402f43c042e103845912028a0971f
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 9
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Fri, 27 Dec 2024 13:11:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#10).
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 400 insertions(+), 40 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/10
src/openvpn/init.c +52 -6
@@ -2445,7 +2445,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2567,6 +2567,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2645,11 +2694,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2745,7 +2791,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update);void inherit_context_child (struct context *dest,const struct context *src);
src/openvpn/multi.c +1 -1
@@ -2409,7 +2409,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +261 -32
329 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +54 -0
60 lines not on this page · raw message
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); + +void +destroy_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx,struct options *options); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 10
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 11: -Code-Review
(1 comment)
File src/openvpn/route.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/f45f9775_7e0c3f33 :
PS11, Line 325: destroy_routes_v4(struct route_list *rl, const struct tuntap *tt,
Apart from lacking comments, how does it differ from delete_routes()? Couldn't we reuse existing function (probably with some adjustments) ?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 11
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Tue, 21 Jan 2025 12:58:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos, stipa.
mrbff has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 11:
(1 comment)
File src/openvpn/route.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/7dd177d3_7d6de585 :
PS11, Line 325: destroy_routes_v4(struct route_list *rl, const struct tuntap *tt,
Quoted 1 line
Apart from lacking comments, how does it differ from
delete_routes()? Couldn't we reuse existing fun […]
The destroy_routes_vx are used to split the logic of delete_routes in v4 and v6 and also to delete the routes in the "options" struct. In most cases where delete_route functions are used it is correct not to delete the routes in the "options" struct so I simply created the functions I needed.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 11
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 21 Jan 2025 14:14:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 11:
(1 comment)
File src/openvpn/route.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/ea98c22c_ce50dc61 :
PS11, Line 325: destroy_routes_v4(struct route_list *rl, const struct tuntap *tt,
Quoted 1 line
The
destroy_routes_vxare used to split the logic ofdelete_routesin v4 and v6 and also to delete t […]
Could we then remove existing delete_routes() which is called from the single place and instead call delete_routes_v4() and delete_routes_v6() (and rename destroy->delete) ?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 11
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Tue, 21 Jan 2025 14:29:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: mrbff <[email protected]...>
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#12).
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 373 insertions(+), 42 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/12
src/openvpn/init.c +52 -6
@@ -2462,7 +2462,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2584,6 +2584,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2662,11 +2711,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2772,7 +2818,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2411,7 +2411,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +271 -32
339 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1258,7 +1258,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1274,8 +1283,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -321,6 +321,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 12
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos, stipa.
mrbff has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 12:
(1 comment)
File src/openvpn/route.h:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/03187090_139abae8 :
PS11, Line 325: destroy_routes_v4(struct route_list *rl, const struct tuntap *tt,
Quoted 1 line
Could we then remove existing
delete_routes()which is called from the single place and instead call […]
ok i extracted the logic from delete_routes() and i separated it into delete_routes_v4() and delete_routes_v6()
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 12
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 21 Jan 2025 15:58:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Comment-In-Reply-To: mrbff <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 12: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 12
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Wed, 22 Jan 2025 09:14:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#13).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 373 insertions(+), 42 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/13
src/openvpn/init.c +52 -6
@@ -2463,7 +2463,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2585,6 +2585,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2663,11 +2712,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2775,7 +2821,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2425,7 +2425,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +271 -32
339 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1257,7 +1257,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1273,8 +1282,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -328,6 +328,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 13
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#14).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 373 insertions(+), 42 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/14
src/openvpn/init.c +52 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2425,7 +2425,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +271 -32
339 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1257,7 +1257,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1273,8 +1282,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -328,6 +328,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 14
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, mrbff, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#15).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 373 insertions(+), 42 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/15
src/openvpn/init.c +52 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,7 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2423,7 +2423,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +271 -32
339 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1265,7 +1265,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1281,8 +1290,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -335,6 +335,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 15
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, mrbff, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 21: Code-Review-1
(4 comments)
Patchset:
PS21:
As discussed on IRC, I do have some things I'd like to see changed before merging.
I am taking note of the +2's already given, it's just polishing, comments, readability...
File src/openvpn/init.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/20d8d7ae_599aaf68 :
PS21, Line 2833: if (!is_update && !check_pull_client_ncp(c, found))
does it make sense to suppress this check? It should never fail, and never modify anything (as we passed on the first run).
As it is, this code is a bit confusing, so we'd need a comment
```
/* on PUSH_UPDATE, do not run the NCP checks, because they take 5 minutes
* to complete and we are in a hurry
*/
```(put the real reasoning there, of course ;-) )
Mmmh, I think I see the reason, OPT_P_NCP is not set on PUSH_UPDATE, so the code assumes "we have no cipher" and does fallback things... so the comment would need to be something like
```
/* on PUSH_UPDATE, NCP related flags are never updated, and so the code
* would assume "no cipher pushed = NCP failed" - so, don't call it on
* updates */
```File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/758d81ff_703882a6 :
PS21, Line 5502: options_server_import(struct options *o, please do not move them (as for 808). thanks :-)
http://gerrit.openvpn.net/c/openvpn/+/809/comment/dbc0b2a7_f3d837dd :
PS21, Line 3134: }
with the extra code, the comment before the function is no longer appropriate.
Also, it's unclear to me why this is needed? I'm not guessing the reasoning but claiming "this does not look reasonable" - if redirect-gateway def1 was pushed or updated, we should not remove it again just because it's not METHOD_SERVICE?
If we need it, we definitely need a comment to explain why.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 21
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Comment-Date: Mon, 21 Jul 2025 18:25:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, mrbff, plaisthos, stipa.
Hello cron2, flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
to look at the new patch set (#22).
The following approvals got outdated and were removed:
Code-Review+2 by stipa, Code-Review-1 by cron2
The change is no longer submittable: Code-Review and checks~ChecksSubmitRule are unsatisfied now.
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 350 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/22
src/openvpn/init.c +55 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,10 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +/* On PUSH_UPDATE, NCP related flags are never updated, and so the code +* would assume "no cipher pushed = NCP failed" - so, don't call it on +* updates */ +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2424,7 +2424,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +245 -1
276 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1265,7 +1265,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1281,8 +1290,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -335,6 +335,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 22
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, flichtenheld, plaisthos, stipa.
mrbff has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 22:
(3 comments)
File src/openvpn/init.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/1bf8ad22_b4ec599b :
PS21, Line 2833: if (!is_update && !check_pull_client_ncp(c, found))
Quoted 1 line
does it make sense to suppress this check? It should never fail, and never modify anything (as we p […]
Done
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/809/comment/0b58e5d7_f3dccb6a :
PS21, Line 5502: options_server_import(struct options *o,
Quoted 1 line
please do not move them (as for 808). […]
Done
http://gerrit.openvpn.net/c/openvpn/+/809/comment/99a69d66_161a9554 :
PS21, Line 3134: }
Quoted 1 line
with the extra code, the comment before the function is no longer appropriate. […]
actually i should remove it, in case of an update of the option routes->flags = 0, so there is no need for this code. I think i forgot there from the previous development where i updated the flags individually. Tnx for the catch.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 22
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Wed, 23 Jul 2025 17:11:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, mrbff, plaisthos, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
Patch Set 22: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 22
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: mrbff <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Sun, 27 Jul 2025 12:21:09 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v23 1/1 PUSH_UPDATE: Added remove_option() and do_update().
In reply to a message not in the archiveFrom: Marco Baffo <[email protected]...>
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/809
This mail reflects revision 23 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/init.c +55 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,10 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +/* On PUSH_UPDATE, NCP related flags are never updated, and so the code +* would assume "no cipher pushed = NCP failed" - so, don't call it on +* updates */ +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2424,7 +2424,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +245 -1
276 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1265,7 +1265,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1281,8 +1290,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -335,6 +335,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
[Openvpn-devel] [PATCH applied] Re: PUSH_UPDATE: Added remove_option() and do_update().
As for the previous patch, this had quite a journey...
+2 from Lev on v12, then rebases up to v21, stylistic discussions with me (and "please add comments so we can remember in two months why this extra check needs to be done" ;-) ), to be integrated into v22, +2'ed again, and v23 another rebase... so recording my +2 as "Acked-by:".
Lev has tested this and confirms the new stuff (808+809+810) works.
I have stared long and hard at the code, and run the client/server side testbeds on it, and nothing breaks. I have not tested the PUSH_UPDATE machinery yet (the t_client tests do excercise the change to split delete_routes(), but that's trivial enough)
Your patch has been applied to the master branch.
commit 73f3247e89bd66fa0b5142e3e1773951f6c3cba0
Author: Marco Baffo Date: Tue Jul 29 12:40:50 2025 +0200
PUSH_UPDATE: Added remove_option() and do_update().
Signed-off-by: Marco Baffo <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32407.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#24) to the change originally created by mrbff. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32407.html
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 350 insertions(+), 11 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/24
src/openvpn/init.c +55 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,10 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +/* On PUSH_UPDATE, NCP related flags are never updated, and so the code +* would assume "no cipher pushed = NCP failed" - so, don't call it on +* updates */ +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2424,7 +2424,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +245 -1
276 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1265,7 +1265,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1281,8 +1290,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -335,6 +335,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 24
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/809?usp=email )
Change subject: PUSH_UPDATE: Added remove_option() and do_update().
......................................................................
PUSH_UPDATE: Added remove_option() and do_update().
* Added remove_option() function and some utility functions to remove options at runtime following the push-update logic.
* Added do_update() function to close and reopen the tun and apply option updates.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg32407.html
---
M src/openvpn/init.c
M src/openvpn/init.h
M src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 350 insertions(+), 11 deletions(-)
src/openvpn/init.c +55 -6
@@ -2470,7 +2470,7 @@if (pulled_options) { -if (!do_deferred_options (c, option_types_found)) +if (!do_deferred_options (c, option_types_found, false)) {msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false;
@@ -2594,6 +2594,55 @@return true; } +bool +do_update (struct context *c,unsigned int option_types_found) +{ +/* Not necessary since to receive the update the openvpn +* instance must be up and running but just in case +*/ +if (!c->c2.do_up_ran) + { +return false; + } + +bool tt_dco_win =tuntap_is_dco_win (c->c1.tuntap); +if (tt_dco_win) + { +msg (M_NONFATAL ,"dco-win doesn't yet support reopening TUN device" ); +return false; + } + +if (!do_deferred_options (c, option_types_found, true)) + { +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +return false; + } + +do_close_tun (c, true); + +management_sleep (1 ); +int error_flags =0 ; + c->c2.did_open_tun =do_open_tun (c, &error_flags); +update_time (); + +if (c->c2.did_open_tun) + { +/* if --route-delay was specified, start timer */ +if ((route_order (c->c1.tuntap) ==ROUTE_AFTER_TUN ) && c->options.route_delay_defined) + { +event_timeout_init (&c->c2.route_wakeup, c->options.route_delay, now); +event_timeout_init (&c->c2.route_wakeup_expire, c->options.route_delay + c->options.route_delay_window, now); +tun_standby_init (c->c1.tuntap); + } + +initialization_sequence_completed (c, error_flags); + } + +CLEAR (c->c1.pulled_options_digest_save); + +return true; +} +/* * These are the option categories which will be accepted by pull. */
@@ -2672,11 +2721,8 @@return true; } -/* -* Handle non-tun-related pulled options. -*/ bool -do_deferred_options (struct context *c,const unsigned int found) +do_deferred_options (struct context *c,const unsigned int found,const bool is_update) {if (found &OPT_P_MESSAGES ) {
@@ -2784,7 +2830,10 @@/* process (potentially) pushed options */ if (c->options.pull) { -if (!check_pull_client_ncp (c, found)) +/* On PUSH_UPDATE, NCP related flags are never updated, and so the code +* would assume "no cipher pushed = NCP failed" - so, don't call it on +* updates */ +if (!is_update && !check_pull_client_ncp (c, found)) {return false; }
src/openvpn/init.h +17 -1
@@ -86,13 +86,29 @@bool pulled_options, unsigned int option_types_found); +/** +* @brief A simplified version of the do_up() function. This function is called +* after receiving a successful PUSH_UPDATE message. It closes and reopens +* the TUN device to apply the updated options. +* +* @param c The context structure. +* @param option_types_found The options found in the PUSH_UPDATE message. +* @return true on success. +* @return false on error. +*/ +bool do_update (struct context *c,unsigned int option_types_found); +unsigned int pull_permission_mask (const struct context *c);const char *format_common_name (struct context *c,struct gc_arena *gc);void reset_coarse_timers (struct context *c); -bool do_deferred_options (struct context *c,const unsigned int found); +/* +* Handle non-tun-related pulled options. +* Set `is_update` param to true to skip NCP check. +*/ +bool do_deferred_options (struct context *c,const unsigned int found,const bool is_update); void inherit_context_child(struct context *dest, const struct context *src,
src/openvpn/multi.c +1 -1
@@ -2424,7 +2424,7 @@/* * Process sourced options. */ -do_deferred_options (&mi->context, option_types_found); +do_deferred_options (&mi->context, option_types_found, false);/* * make sure we got ifconfig settings from somewhere
src/openvpn/options.c +245 -1
276 lines not on this page · raw message
src/openvpn/push.c +5 -0
@@ -542,6 +542,11 @@ {msg (M_WARN ,"No updatable options found in incoming PUSH_UPDATE message" ); } + else if (!do_update(c, option_types_found)) + { +msg (D_PUSH_ERRORS ,"Failed to update options" ); + goto error; + } } }event_timeout_clear (&c->c2.push_request_interval);
src/openvpn/route.c +17 -2
@@ -1265,7 +1265,16 @@ const struct tuntap *tt, unsigned int flags, const struct env_set *es, openvpn_net_ctx_t *ctx) { - if (rl && rl->iflags & RL_ROUTES_ADDED) +delete_routes_v4 (rl ,tt ,flags ,es ,ctx ); +delete_routes_v6 (rl6, tt, flags, es, ctx); +} + +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl && (rl->iflags &RL_ROUTES_ADDED )) {struct route_ipv4 *r;for (r = rl->routes; r; r = r->next)
@@ -1281,8 +1290,14 @@ {clear_route_list (rl); } +} -if (rl6 && (rl6->iflags &RL_ROUTES_ADDED ) ) +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx) +{ +if (rl6 && (rl6->iflags &RL_ROUTES_ADDED )) {struct route_ipv6 *r6;for (r6 = rl6->routes_ipv6; r6; r6 = r6->next)
src/openvpn/route.h +10 -0
@@ -335,6 +335,16 @@const struct env_set *es, openvpn_net_ctx_t *ctx); +void +delete_routes_v4 (struct route_list *rl,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); + +void +delete_routes_v6 (struct route_ipv6_list *rl6,const struct tuntap *tt, +unsigned int flags,const struct env_set *es, +openvpn_net_ctx_t *ctx); +void setenv_routes (struct env_set *es,const struct route_list *rl);void setenv_routes_ipv6 (struct env_set *es,const struct route_ipv6_list *rl6);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 24
Gerrit-Owner: mrbff <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged